Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert - #879 and #768 #3521

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Conversation

Lichtso
Copy link

@Lichtso Lichtso commented Nov 7, 2024

Problem

Summary of Changes

This reverts these commits:

@Lichtso Lichtso marked this pull request as ready for review November 7, 2024 16:37
@Lichtso Lichtso force-pushed the revert/879_and_768_on_master branch from a0af9a3 to 62fd83a Compare November 7, 2024 16:41
@@ -286,12 +287,12 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
&validation_results,
PROGRAM_OWNERS
));
let native_loader = native_loader::id();
for builtin_program in self.builtin_program_ids.read().unwrap().iter() {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we want to take this out of the timing measurement?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should probably go in the measurement above instead. But should not really matter. I can move it anyway.

@Lichtso Lichtso force-pushed the revert/879_and_768_on_master branch 2 times, most recently from e3d1697 to 0ff3b76 Compare November 7, 2024 17:59
t-nelson
t-nelson previously approved these changes Nov 7, 2024
@Lichtso Lichtso added the v2.1 Backport to v2.1 branch label Nov 7, 2024
Copy link

mergify bot commented Nov 7, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

@Lichtso
Copy link
Author

Lichtso commented Nov 7, 2024

Sorry, forgot to run svm/tests/concurrent_tests.rs which is behind a cfg. So, needs to be re-approved.

@Lichtso Lichtso merged commit 57bdb8e into anza-xyz:master Nov 8, 2024
40 checks passed
@Lichtso Lichtso deleted the revert/879_and_768_on_master branch November 8, 2024 15:59
mergify bot pushed a commit that referenced this pull request Nov 8, 2024
* Revert "Cleanup - Removes the owner form the result of `filter_executable_program_accounts()` (#879)"

This reverts commit 5fe30cb.

* Revert "Refactor - Remove `program_accounts_map` from account_loader (#768)"

This reverts commit e7617a1.

(cherry picked from commit 57bdb8e)
Lichtso added a commit that referenced this pull request Nov 8, 2024
Revert - #879 and #768 (#3521)

* Revert "Cleanup - Removes the owner form the result of `filter_executable_program_accounts()` (#879)"

This reverts commit 5fe30cb.

* Revert "Refactor - Remove `program_accounts_map` from account_loader (#768)"

This reverts commit e7617a1.

(cherry picked from commit 57bdb8e)

Co-authored-by: Alexander Meißner <AlexanderMeissner@gmx.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2.1 Backport to v2.1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants